Skip to content

Conversation

blink1073
Copy link
Member

@blink1073 blink1073 commented Sep 16, 2025

Reverts PYTHON-5543 and PYTHON-5215

I made a few hand-edits afterward that were typing-only to accommodate conflicts from #2524

@blink1073 blink1073 requested a review from NoahStapp September 16, 2025 12:48
@blink1073 blink1073 requested a review from a team as a code owner September 16, 2025 12:48
@blink1073
Copy link
Member Author

I reverted the changelog changes so this will cleanly backport, I'll handle the changelog and version update in a separate PR.

@blink1073
Copy link
Member Author

drivers-pr-bot please backport to v4.15

@blink1073 blink1073 merged commit 7a07c02 into mongodb:master Sep 16, 2025
87 of 90 checks passed
@blink1073 blink1073 deleted the PYTHON-5544 branch September 16, 2025 14:16
Copy link
Contributor

Sorry, unable to cherry-pick to v4.15, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout -b cherry-pick-v4.15-7a07c0281457f16fe807e4e65ef0c13f7b1deb2f v4.15

git fetch origin 7a07c0281457f16fe807e4e65ef0c13f7b1deb2f
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7a07c0281457f16fe807e4e65ef0c13f7b1deb2f
  1. You will likely have some merge/cherry-pick conflicts here, fix them and commit:
git commit -am {message}
  1. Push to a named branch:
git push origin cherry-pick-v4.15-7a07c0281457f16fe807e4e65ef0c13f7b1deb2f
  1. Create a PR against branch v4.15. I would have named this PR:

"PYTHON-5544 Revert changes to base protocol layer (#2535) [v4.15]"

@blink1073
Copy link
Member Author

so much for that idea...

blink1073 added a commit to blink1073/mongo-python-driver that referenced this pull request Sep 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants